From 895e94caf9dda9d2446f56000d137934dddd32e5 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=C3=98yvind=20Kol=C3=A5s?= Date: Wed, 11 Jul 2018 22:47:30 +0200 Subject: [PATCH] babl: make equalize_matrix argument an enum --- babl/babl-space.c | 6 +++--- babl/babl.h | 13 ++++++++----- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/babl/babl-space.c b/babl/babl-space.c index 793ab7f..7a3fa68 100644 --- a/babl/babl-space.c +++ b/babl/babl-space.c @@ -167,7 +167,7 @@ static void babl_matrix_equalize (double *in_mat) } } -static void babl_space_compute_matrices (BablSpace *space, int equalize_matrix) +static void babl_space_compute_matrices (BablSpace *space, BablSpaceFlags equalize_matrix) { #define _ space-> /* transform spaces xy(Y) specified data to XYZ */ @@ -313,7 +313,7 @@ babl_chromaticities_make_space (const char *name, const Babl *trc_red, const Babl *trc_green, const Babl *trc_blue, - int equalize_matrix) + BablSpaceFlags flags) { int i=0; static BablSpace space; @@ -363,7 +363,7 @@ babl_chromaticities_make_space (const char *name, babl_get_name(space.trc[1]), babl_get_name(space.trc[2])); /* compute matrixes */ - babl_space_compute_matrices (&space_db[i], equalize_matrix); + babl_space_compute_matrices (&space_db[i], flags); return (Babl*)&space_db[i]; } diff --git a/babl/babl.h b/babl/babl.h index d483249..c6052e7 100644 --- a/babl/babl.h +++ b/babl/babl.h @@ -195,8 +195,8 @@ const Babl * babl_format_get_space (const Babl *format); * destination_format, source and destination can be either strings * with the names of the formats or Babl-format objects. */ -const Babl * babl_fish (const void *source_format, - const void *destination_format); +const Babl * babl_fish (const void *source_format, + const void *destination_format); /** @@ -434,7 +434,6 @@ void babl_palette_set_palette (const Babl *babl, void babl_palette_reset (const Babl *babl); - /** * babl_set_user_data: (skip) * @@ -452,6 +451,10 @@ void babl_set_user_data (const Babl *babl, void *data); */ void * babl_get_user_data (const Babl *babl); +typedef enum { + BABL_SPACE_FLAG_NONE = 0, + BABL_SPACE_FLAG_EQUALIZE = 1 +} BablSpaceFlags; /** * babl_space_from_chromaticities: @@ -472,7 +475,7 @@ const Babl * babl_chromaticities_make_space (const char *name, const Babl *trc_red, const Babl *trc_green, const Babl *trc_blue, - int equalize_matrix); + BablSpaceFlags flags); /** @@ -489,7 +492,7 @@ const Babl * babl_trc_gamma (double gamma); * Look up a TRC by name, "sRGB" "1.0" "linear" and "2.2" are recognized * strings in a stock babl configuration. */ -const Babl * babl_trc (const char *name); +const Babl * babl_trc (const char *name); typedef enum { BABL_ICC_DEFAULTS = 0, -- 2.30.2